Migrate CHOMP and collision tutorials from ROS1 #492
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
doc/examples/collision_environments/src/collision_scene_example.cpp
Outdated
Show resolved
Hide resolved
doc/examples/collision_environments/src/collision_scene_example.cpp
Outdated
Show resolved
Hide resolved
doc/examples/collision_environments/src/collision_scene_example.cpp
Outdated
Show resolved
Hide resolved
AndyZe
changed the title
AndyZe
reviewed
Sep 27, 2022
doc/examples/collision_environments/src/collision_scene_example.cpp
Outdated
Show resolved
Hide resolved
doc/examples/collision_environments/src/collision_scene_example.cpp
Outdated
Show resolved
Hide resolved
doc/examples/collision_environments/src/collision_scene_example.cpp
Outdated
Show resolved
Hide resolved
AndyZe
reviewed
Sep 28, 2022
AndyZe
approved these changes
Sep 28, 2022
Comment on lines
+45
to
+46
| rviz_full_config = os.path.join(rviz_base, "moveit_chomp.rviz") | ||
| rviz_empty_config = os.path.join(rviz_base, "moveit_chomp.rviz") |
There was a problem hiding this comment.
If these lines are meant to be the same, do we need to have two configuration variables and the IfCondition for rviz_node_tutorial and rviz_node?
henningkayser
added
the
backport-humble
|
This pull request is in conflict. Could you fix it @MikeWrock? |
stephanie-eng
approved these changes
Mar 10, 2023
|
This pull request is in conflict. Could you fix it @MikeWrock? |
1 similar comment
|
This pull request is in conflict. Could you fix it @MikeWrock? |
sjahr
reviewed
Jul 19, 2023
mergify bot
pushed a commit
that referenced
this pull request
Aug 10, 2023
* Migrated tutorial from ROS1 * Fix merging error in CMakeLists.txt --------- Co-authored-by: Henning Kayser <[email protected]> Co-authored-by: Sebastian Jahr <[email protected]> (cherry picked from commit 725c7d8) # Conflicts: # CMakeLists.txt # doc/examples/chomp_planner/chomp_planner_tutorial.rst # doc/examples/planning_adapters/planning_adapters_tutorial.rst # doc/how_to_guides/how_to_guides.rst
sjahr
added a commit
that referenced
this pull request
Aug 10, 2023
… humble (#742) * Migrate CHOMP and collision tutorials from ROS1 (#492) * Migrated tutorial from ROS1 * Fix merging error in CMakeLists.txt --------- Co-authored-by: Henning Kayser <[email protected]> Co-authored-by: Sebastian Jahr <[email protected]> (cherry picked from commit 725c7d8) # Conflicts: # CMakeLists.txt # doc/examples/chomp_planner/chomp_planner_tutorial.rst # doc/examples/planning_adapters/planning_adapters_tutorial.rst # doc/how_to_guides/how_to_guides.rst * Address rebasing conflicts * Remove references to non-existing files and cleanup * Cleanups * Update doc/examples/examples.rst --------- Co-authored-by: Michael Wrock <[email protected]> Co-authored-by: Sebastian Jahr <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Please explain the changes you made, including a reference to the related issue if applicable
Checklist